Merge pull request #99 from menny/master

Many commits with the aim to stabilize the app
Merge remote-tracking branch 'upstream/master'