OCHA-DAP/DAP-System — pull request #93 by aalecs (2014-03-24 16:29:05+00:00)
Title: Fixing issues #54 and #78

Please see individual commits description, thanks!