Fixes for the following issues:
  https://github.com/datacenter/ACI/issues/7
  https://github.com/datacenter/ACI/issues/8

Bumped version number as per mtimm's request
Merge branch 'master' of https://github.com/datacenter/ACI