Merged dev to master to start tracking using GitHub.