Fixed bug #4 from github