Testing a dev push

Test
Merge pull request #3 from atheiman/dev

Testing a dev push