Merge pull request #35 from Apelon-VA/master

syncing everything again