Merge pull request #22 from KennethAS/master

merge master and 0808xam
Merge pull request #23 from KennethAS/0808xam

Merge pull request #22 from KennethAS/master