titaniumtroop Merge pull request #18 from titaniumtroop/master