Fixed NSF submission
Merge pull request #1293 from priand/playground2

Fixed NSF submission