Fix #50
Merge branch 'development' of github.com:irail/hyperrail into develop