Merge pull request #56 from fwilson42/dev

+demorse close #55