Merge pull request #80 from dapetcu21/master

Fix watch compile
Ship  bugfix.
Merge branch 'dev' of https://github.com/learnfwd/lfa into dev