Issue/53

@karlitschek 

Fix #53