merge pull #44 into master