merging in changes from master after 0.3.2 and my number change.