Merge pull request #1 from four04/master

Pull Request for 2013-06-06