fix before merge'
merge
merge before toolbar work
Merge pull request #21 from JALsnipe/master

merged Dan's work