Merge pull request #180 from easye/abcl-fixes-20140818a

Abcl fixes 20140818a