Merge pull request #36 from Apelon-VA/master

pushing up to master