Merge pull request #97 from quintonm/master

prepare for releasing