fixing #51
Merge branch 'devel' of github.com:touchandgo-devs/touchandgo into devel