Merge pull request uwbmrb#24 from kumar-physics/master