Merge pull request #1 from softwarejc/master

Pull master to dev