Merge pull request #575 from nmaas87/patch-1