reverted to commit 982c7449add for personal use, takac master broke the plugin for me