Merge pull request #9 from mselig/develop

version update
ongoing development.