Merge pull request #6 from brint/master

Bumping test timeout to 45 minutes