beta7 updates
Merge pull request #17 from orta/beta7

@ashfurrow => beta7 updates