Apply checkstyle and sample changes
Merge pull request #150 from miniway/master

Apply checkstyle and sample changes