Reviewed-on: https://git.hush.is/hush/SilentDragonLite/pulls/24
added changes from @gilardh to resolve the conflicting file in PR #1