Merge pull request #95 from dmodoomsirius/master

Adding FML to be polled
Fix indentation
Remove never used code