Fixes #18 - AppAware