Merge pull request #13 from tackle/master

Pull Request #2