Merge pull request #425 from nibalizer/master