un-hardcodize ur-macro
Merge pull request #101 from ipa-fxm/hydro_dev

un-hardcodize ur-macro