Merged pull request 48 into Version 0.6.48