#154 - preparations for alpha version
Merge remote-tracking branch 'origin/master'