Merge pull request #156 from ncolomer/master