Testing git workflow
Merge pull request #146 from dshurt/master

Testing git workflow