Allow for non activity context
Merge pull request #1 from FutureHax/develop

Allow for non activity context