Merge pull request #1 from bowaxwing/dev

Dev
pull test
dev push