Fixed issues. Demo project updated. Tag 0.0.7