Add demo; Minor fixes; Version 0.0.2