Fixes #189
Merge branch 'dev' of https://github.com/projectfork/Projectfork into dev