Merged dev to master to start tracking using GitHub.
Merge branch 'master' into dev