final details
Merge pull request #63 from dupps/master

final details
Merge pull request #15 from cbos-team/master

final details