#154 - preparations for alpha version