Merge pull request #1 from flyapen/master

merge changes flyapen
Merge remote-tracking branch 'icto/master'
add make again because god gem cannot be installed without it