Finished work (bugfixes not included)
Merge branch 'master' of https://github.com/forflo/archfai