bugfix
Merge branch 'master' of github.com:tick-tack/apeman