MICASERVER-167
Merge pull request #246 from kazoompa/MICASERVER-167

MICASERVER-167