Merge pull request #3 from vbawol/master

Pull from awols epoch