Merge pull request #37 from rmoshier/callap

Callap
flash notice
Merge branch 'master' into callap