Merged issue #4 from github master