fixed Gitcafe #17 and Github #24