Fixed issue #42

#42 done