fixed merge issue (replaced new codes with old from old fork @tlvince you need to update ur fork to the latest master repo) Refs #99