Merge pull request #6 from kdop/master

AMOS II Connectivity
Merge pull request #7 from kdop/master

Pull before merge
Merged the two modules