Commited something on the develop branch -- more
Merge pull request #2 from rwestergren/develop

Commited something on the develop branch -- more