Fixed #20
Fixed #20
Fixed  #15
Added availability set #17
Merge pull request #23 from ranjan/dev

Added availability set and fixed issues.
Merge branch 'dev'