Merge pull request #189 from phuzion/master