Implementing some customer requests
Merge branch 'iteration3' of https://github.com/NameCT/CIS/ into
iteration3