Reviewed
fix general_remakrs
Merge pull request #13 from baasbox/master

pull from master