Merge pull request #22 from KennethAS/master

merge master and 0808xam