#112 Improvement but not bugfix yet :(
#112 Cheated