Changed timeout variable type to NSTimeInterval, fixes #6
Merge branch 'gug/issue_6' into develop
Performed changes recommended by Xcode 5.1 upgrade check, closes #7
Merge branch 'gug/issue_7' into develop