diff --git a/c.go b/c.go
index 3b21558da4c77fba2089a53f1a14d6eeb5cc3ae7..152f438601db28e3df185c4a0a7e9e261515a645 100644
--- a/c.go
+++ b/c.go
@@ -1,25 +1,23 @@
-/*
-	Copyright © 2015 Nik Unger
-
-	This file is part of The PBC Go Wrapper.
-
-	The PBC Go Wrapper is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	The PBC Go Wrapper is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-	GNU Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with The PBC Go Wrapper. If not, see <http://www.gnu.org/licenses/>.
-
-	The PBC Go Wrapper makes use of The PBC library. The PBC Library and its
-	use are covered under the terms of the GNU Lesser General Public License
-	version 3, or (at your option) any later version.
-*/
+// Copyright © 2015 Nik Unger
+//
+// This file is part of The PBC Go Wrapper.
+//
+// The PBC Go Wrapper is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Lesser General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or (at your
+// option) any later version.
+//
+// The PBC Go Wrapper is distributed in the hope that it will be useful, but
+// WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+// or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
+// License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public License
+// along with The PBC Go Wrapper. If not, see <http://www.gnu.org/licenses/>.
+//
+// The PBC Go Wrapper makes use of The PBC library. The PBC Library and its use
+// are covered under the terms of the GNU Lesser General Public License
+// version 3, or (at your option) any later version.
 
 package pbc
 
diff --git a/doc.go b/doc.go
index c2c0041d71bb9aeb267a888d8b469245ed942bc0..93002b6651c9e7388ece9f1a6241d6357585dbba 100644
--- a/doc.go
+++ b/doc.go
@@ -1,25 +1,23 @@
-/*
-	Copyright © 2015 Nik Unger
-
-	This file is part of The PBC Go Wrapper.
-
-	The PBC Go Wrapper is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	The PBC Go Wrapper is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-	GNU Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with The PBC Go Wrapper. If not, see <http://www.gnu.org/licenses/>.
-
-	The PBC Go Wrapper makes use of The PBC library. The PBC Library and its
-	use are covered under the terms of the GNU Lesser General Public License
-	version 3, or (at your option) any later version.
-*/
+// Copyright © 2015 Nik Unger
+//
+// This file is part of The PBC Go Wrapper.
+//
+// The PBC Go Wrapper is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Lesser General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or (at your
+// option) any later version.
+//
+// The PBC Go Wrapper is distributed in the hope that it will be useful, but
+// WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+// or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
+// License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public License
+// along with The PBC Go Wrapper. If not, see <http://www.gnu.org/licenses/>.
+//
+// The PBC Go Wrapper makes use of The PBC library. The PBC Library and its use
+// are covered under the terms of the GNU Lesser General Public License
+// version 3, or (at your option) any later version.
 
 /*
 	Package pbc provides structures for building pairing-based cryptosystems. It
diff --git a/doc_bls_test.go b/doc_bls_test.go
index 7b4c6b0574fccf93b75890ff27e2d87c0c6ccc68..0e0dad79a26c854fe0f49c4c866e06331e6e7e93 100644
--- a/doc_bls_test.go
+++ b/doc_bls_test.go
@@ -1,25 +1,23 @@
-/*
-	Copyright © 2015 Nik Unger
-
-	This file is part of The PBC Go Wrapper.
-
-	The PBC Go Wrapper is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	The PBC Go Wrapper is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-	GNU Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with The PBC Go Wrapper. If not, see <http://www.gnu.org/licenses/>.
-
-	The PBC Go Wrapper makes use of The PBC library. The PBC Library and its
-	use are covered under the terms of the GNU Lesser General Public License
-	version 3, or (at your option) any later version.
-*/
+// Copyright © 2015 Nik Unger
+//
+// This file is part of The PBC Go Wrapper.
+//
+// The PBC Go Wrapper is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Lesser General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or (at your
+// option) any later version.
+//
+// The PBC Go Wrapper is distributed in the hope that it will be useful, but
+// WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+// or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
+// License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public License
+// along with The PBC Go Wrapper. If not, see <http://www.gnu.org/licenses/>.
+//
+// The PBC Go Wrapper makes use of The PBC library. The PBC Library and its use
+// are covered under the terms of the GNU Lesser General Public License
+// version 3, or (at your option) any later version.
 
 package pbc_test
 
diff --git a/doc_test.go b/doc_test.go
index b102e52d7aeaff9aef6eded04273122ed1a96be7..4dce3a6a8b5786d1b355cead26cbb7dedebd59ef 100644
--- a/doc_test.go
+++ b/doc_test.go
@@ -1,25 +1,23 @@
-/*
-	Copyright © 2015 Nik Unger
-
-	This file is part of The PBC Go Wrapper.
-
-	The PBC Go Wrapper is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	The PBC Go Wrapper is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-	GNU Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with The PBC Go Wrapper. If not, see <http://www.gnu.org/licenses/>.
-
-	The PBC Go Wrapper makes use of The PBC library. The PBC Library and its
-	use are covered under the terms of the GNU Lesser General Public License
-	version 3, or (at your option) any later version.
-*/
+// Copyright © 2015 Nik Unger
+//
+// This file is part of The PBC Go Wrapper.
+//
+// The PBC Go Wrapper is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Lesser General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or (at your
+// option) any later version.
+//
+// The PBC Go Wrapper is distributed in the hope that it will be useful, but
+// WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+// or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
+// License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public License
+// along with The PBC Go Wrapper. If not, see <http://www.gnu.org/licenses/>.
+//
+// The PBC Go Wrapper makes use of The PBC library. The PBC Library and its use
+// are covered under the terms of the GNU Lesser General Public License
+// version 3, or (at your option) any later version.
 
 package pbc_test
 
diff --git a/element.go b/element.go
index 077706db9e87d4966c81c05e2d2995972e41a481..7a1a0c708b1323725d0fd18b1f811ee121001cfe 100644
--- a/element.go
+++ b/element.go
@@ -1,25 +1,23 @@
-/*
-	Copyright © 2015 Nik Unger
-
-	This file is part of The PBC Go Wrapper.
-
-	The PBC Go Wrapper is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	The PBC Go Wrapper is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-	GNU Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with The PBC Go Wrapper. If not, see <http://www.gnu.org/licenses/>.
-
-	The PBC Go Wrapper makes use of The PBC library. The PBC Library and its
-	use are covered under the terms of the GNU Lesser General Public License
-	version 3, or (at your option) any later version.
-*/
+// Copyright © 2015 Nik Unger
+//
+// This file is part of The PBC Go Wrapper.
+//
+// The PBC Go Wrapper is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Lesser General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or (at your
+// option) any later version.
+//
+// The PBC Go Wrapper is distributed in the hope that it will be useful, but
+// WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+// or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
+// License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public License
+// along with The PBC Go Wrapper. If not, see <http://www.gnu.org/licenses/>.
+//
+// The PBC Go Wrapper makes use of The PBC library. The PBC Library and its use
+// are covered under the terms of the GNU Lesser General Public License
+// version 3, or (at your option) any later version.
 
 package pbc
 
diff --git a/element_arith.go b/element_arith.go
index b38df52a99837afd1a102d1dcf0e1aae72b0c207..f9874a1756d1caf3d75827aa2e4faf6c9b1a20bf 100644
--- a/element_arith.go
+++ b/element_arith.go
@@ -1,25 +1,23 @@
-/*
-	Copyright © 2015 Nik Unger
-
-	This file is part of The PBC Go Wrapper.
-
-	The PBC Go Wrapper is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	The PBC Go Wrapper is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-	GNU Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with The PBC Go Wrapper. If not, see <http://www.gnu.org/licenses/>.
-
-	The PBC Go Wrapper makes use of The PBC library. The PBC Library and its
-	use are covered under the terms of the GNU Lesser General Public License
-	version 3, or (at your option) any later version.
-*/
+// Copyright © 2015 Nik Unger
+//
+// This file is part of The PBC Go Wrapper.
+//
+// The PBC Go Wrapper is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Lesser General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or (at your
+// option) any later version.
+//
+// The PBC Go Wrapper is distributed in the hope that it will be useful, but
+// WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+// or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
+// License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public License
+// along with The PBC Go Wrapper. If not, see <http://www.gnu.org/licenses/>.
+//
+// The PBC Go Wrapper makes use of The PBC library. The PBC Library and its use
+// are covered under the terms of the GNU Lesser General Public License
+// version 3, or (at your option) any later version.
 
 package pbc
 
diff --git a/element_arith_simple.go b/element_arith_simple.go
index 4285f21f91b366be7e974b8b991b8c69ecc150ec..a48870e30de1a5227a3fb65cceb0568e38c28a19 100644
--- a/element_arith_simple.go
+++ b/element_arith_simple.go
@@ -1,25 +1,23 @@
-/*
-	Copyright © 2015 Nik Unger
-
-	This file is part of The PBC Go Wrapper.
-
-	The PBC Go Wrapper is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	The PBC Go Wrapper is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-	GNU Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with The PBC Go Wrapper. If not, see <http://www.gnu.org/licenses/>.
-
-	The PBC Go Wrapper makes use of The PBC library. The PBC Library and its
-	use are covered under the terms of the GNU Lesser General Public License
-	version 3, or (at your option) any later version.
-*/
+// Copyright © 2015 Nik Unger
+//
+// This file is part of The PBC Go Wrapper.
+//
+// The PBC Go Wrapper is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Lesser General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or (at your
+// option) any later version.
+//
+// The PBC Go Wrapper is distributed in the hope that it will be useful, but
+// WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+// or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
+// License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public License
+// along with The PBC Go Wrapper. If not, see <http://www.gnu.org/licenses/>.
+//
+// The PBC Go Wrapper makes use of The PBC library. The PBC Library and its use
+// are covered under the terms of the GNU Lesser General Public License
+// version 3, or (at your option) any later version.
 
 package pbc
 
diff --git a/element_fmt.go b/element_fmt.go
index 45f157d40305a30540a1b0d144458a76b79315bc..ba88b80c796d5400f3d2a1c93b20b37d79e8b981 100644
--- a/element_fmt.go
+++ b/element_fmt.go
@@ -1,25 +1,23 @@
-/*
-	Copyright © 2015 Nik Unger
-
-	This file is part of The PBC Go Wrapper.
-
-	The PBC Go Wrapper is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	The PBC Go Wrapper is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-	GNU Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with The PBC Go Wrapper. If not, see <http://www.gnu.org/licenses/>.
-
-	The PBC Go Wrapper makes use of The PBC library. The PBC Library and its
-	use are covered under the terms of the GNU Lesser General Public License
-	version 3, or (at your option) any later version.
-*/
+// Copyright © 2015 Nik Unger
+//
+// This file is part of The PBC Go Wrapper.
+//
+// The PBC Go Wrapper is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Lesser General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or (at your
+// option) any later version.
+//
+// The PBC Go Wrapper is distributed in the hope that it will be useful, but
+// WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+// or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
+// License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public License
+// along with The PBC Go Wrapper. If not, see <http://www.gnu.org/licenses/>.
+//
+// The PBC Go Wrapper makes use of The PBC library. The PBC Library and its use
+// are covered under the terms of the GNU Lesser General Public License
+// version 3, or (at your option) any later version.
 
 package pbc
 
diff --git a/element_io.go b/element_io.go
index fd451a5a4b085a3336fea3bc99c15bc161019f89..2a80dd449815d2847aa632ff8e42ac576a868952 100644
--- a/element_io.go
+++ b/element_io.go
@@ -1,25 +1,23 @@
-/*
-	Copyright © 2015 Nik Unger
-
-	This file is part of The PBC Go Wrapper.
-
-	The PBC Go Wrapper is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	The PBC Go Wrapper is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-	GNU Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with The PBC Go Wrapper. If not, see <http://www.gnu.org/licenses/>.
-
-	The PBC Go Wrapper makes use of The PBC library. The PBC Library and its
-	use are covered under the terms of the GNU Lesser General Public License
-	version 3, or (at your option) any later version.
-*/
+// Copyright © 2015 Nik Unger
+//
+// This file is part of The PBC Go Wrapper.
+//
+// The PBC Go Wrapper is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Lesser General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or (at your
+// option) any later version.
+//
+// The PBC Go Wrapper is distributed in the hope that it will be useful, but
+// WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+// or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
+// License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public License
+// along with The PBC Go Wrapper. If not, see <http://www.gnu.org/licenses/>.
+//
+// The PBC Go Wrapper makes use of The PBC library. The PBC Library and its use
+// are covered under the terms of the GNU Lesser General Public License
+// version 3, or (at your option) any later version.
 
 package pbc
 
diff --git a/element_misc.go b/element_misc.go
index 5da5811f33d174b28393810952db6a05b3b2afcc..33530918cd18286b84d5e8144dfd446eebea2744 100644
--- a/element_misc.go
+++ b/element_misc.go
@@ -1,25 +1,23 @@
-/*
-	Copyright © 2015 Nik Unger
-
-	This file is part of The PBC Go Wrapper.
-
-	The PBC Go Wrapper is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	The PBC Go Wrapper is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-	GNU Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with The PBC Go Wrapper. If not, see <http://www.gnu.org/licenses/>.
-
-	The PBC Go Wrapper makes use of The PBC library. The PBC Library and its
-	use are covered under the terms of the GNU Lesser General Public License
-	version 3, or (at your option) any later version.
-*/
+// Copyright © 2015 Nik Unger
+//
+// This file is part of The PBC Go Wrapper.
+//
+// The PBC Go Wrapper is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Lesser General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or (at your
+// option) any later version.
+//
+// The PBC Go Wrapper is distributed in the hope that it will be useful, but
+// WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+// or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
+// License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public License
+// along with The PBC Go Wrapper. If not, see <http://www.gnu.org/licenses/>.
+//
+// The PBC Go Wrapper makes use of The PBC library. The PBC Library and its use
+// are covered under the terms of the GNU Lesser General Public License
+// version 3, or (at your option) any later version.
 
 package pbc
 
diff --git a/errors.go b/errors.go
index 99aef06042d124854f4dad0b3ad60f5a35d45dc9..6cf4d6681660d157ef4d39d492887641f01f0b1e 100644
--- a/errors.go
+++ b/errors.go
@@ -1,25 +1,23 @@
-/*
-	Copyright © 2015 Nik Unger
-
-	This file is part of The PBC Go Wrapper.
-
-	The PBC Go Wrapper is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	The PBC Go Wrapper is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-	GNU Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with The PBC Go Wrapper. If not, see <http://www.gnu.org/licenses/>.
-
-	The PBC Go Wrapper makes use of The PBC library. The PBC Library and its
-	use are covered under the terms of the GNU Lesser General Public License
-	version 3, or (at your option) any later version.
-*/
+// Copyright © 2015 Nik Unger
+//
+// This file is part of The PBC Go Wrapper.
+//
+// The PBC Go Wrapper is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Lesser General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or (at your
+// option) any later version.
+//
+// The PBC Go Wrapper is distributed in the hope that it will be useful, but
+// WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+// or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
+// License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public License
+// along with The PBC Go Wrapper. If not, see <http://www.gnu.org/licenses/>.
+//
+// The PBC Go Wrapper makes use of The PBC library. The PBC Library and its use
+// are covered under the terms of the GNU Lesser General Public License
+// version 3, or (at your option) any later version.
 
 package pbc
 
diff --git a/generation.go b/generation.go
index ed4d722ad7bf84866d9ef3ba5b15dfc903f1d69e..e78e2886c997842628fd3a5d527c61540c8c1374 100644
--- a/generation.go
+++ b/generation.go
@@ -1,25 +1,23 @@
-/*
-	Copyright © 2015 Nik Unger
-
-	This file is part of The PBC Go Wrapper.
-
-	The PBC Go Wrapper is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	The PBC Go Wrapper is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-	GNU Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with The PBC Go Wrapper. If not, see <http://www.gnu.org/licenses/>.
-
-	The PBC Go Wrapper makes use of The PBC library. The PBC Library and its
-	use are covered under the terms of the GNU Lesser General Public License
-	version 3, or (at your option) any later version.
-*/
+// Copyright © 2015 Nik Unger
+//
+// This file is part of The PBC Go Wrapper.
+//
+// The PBC Go Wrapper is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Lesser General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or (at your
+// option) any later version.
+//
+// The PBC Go Wrapper is distributed in the hope that it will be useful, but
+// WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+// or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
+// License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public License
+// along with The PBC Go Wrapper. If not, see <http://www.gnu.org/licenses/>.
+//
+// The PBC Go Wrapper makes use of The PBC library. The PBC Library and its use
+// are covered under the terms of the GNU Lesser General Public License
+// version 3, or (at your option) any later version.
 
 package pbc
 
diff --git a/gmp_big.go b/gmp_big.go
index 48621f4ca915759e927c3adf8af22a26f115cceb..e315ae2345b7db0ec8adbf5de35bcd63db97d174 100644
--- a/gmp_big.go
+++ b/gmp_big.go
@@ -1,25 +1,23 @@
-/*
-	Copyright © 2015 Nik Unger
-
-	This file is part of The PBC Go Wrapper.
-
-	The PBC Go Wrapper is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	The PBC Go Wrapper is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-	GNU Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with The PBC Go Wrapper. If not, see <http://www.gnu.org/licenses/>.
-
-	The PBC Go Wrapper makes use of The PBC library. The PBC Library and its
-	use are covered under the terms of the GNU Lesser General Public License
-	version 3, or (at your option) any later version.
-*/
+// Copyright © 2015 Nik Unger
+//
+// This file is part of The PBC Go Wrapper.
+//
+// The PBC Go Wrapper is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Lesser General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or (at your
+// option) any later version.
+//
+// The PBC Go Wrapper is distributed in the hope that it will be useful, but
+// WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+// or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
+// License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public License
+// along with The PBC Go Wrapper. If not, see <http://www.gnu.org/licenses/>.
+//
+// The PBC Go Wrapper makes use of The PBC library. The PBC Library and its use
+// are covered under the terms of the GNU Lesser General Public License
+// version 3, or (at your option) any later version.
 
 package pbc
 
diff --git a/pairing.go b/pairing.go
index b7d60bda49d8ddf91c02bb033f47ad957853fdff..69ac21380bcd7010b5fa27655804bcdb292efdd7 100644
--- a/pairing.go
+++ b/pairing.go
@@ -1,25 +1,23 @@
-/*
-	Copyright © 2015 Nik Unger
-
-	This file is part of The PBC Go Wrapper.
-
-	The PBC Go Wrapper is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	The PBC Go Wrapper is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-	GNU Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with The PBC Go Wrapper. If not, see <http://www.gnu.org/licenses/>.
-
-	The PBC Go Wrapper makes use of The PBC library. The PBC Library and its
-	use are covered under the terms of the GNU Lesser General Public License
-	version 3, or (at your option) any later version.
-*/
+// Copyright © 2015 Nik Unger
+//
+// This file is part of The PBC Go Wrapper.
+//
+// The PBC Go Wrapper is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Lesser General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or (at your
+// option) any later version.
+//
+// The PBC Go Wrapper is distributed in the hope that it will be useful, but
+// WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+// or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
+// License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public License
+// along with The PBC Go Wrapper. If not, see <http://www.gnu.org/licenses/>.
+//
+// The PBC Go Wrapper makes use of The PBC library. The PBC Library and its use
+// are covered under the terms of the GNU Lesser General Public License
+// version 3, or (at your option) any later version.
 
 package pbc
 
diff --git a/params.go b/params.go
index 2da5fd5316ff5cf694b39d996d999b6682bcd675..c729348c005a28bbaaa2175b2f55291cf697b7db 100644
--- a/params.go
+++ b/params.go
@@ -1,25 +1,23 @@
-/*
-	Copyright © 2015 Nik Unger
-
-	This file is part of The PBC Go Wrapper.
-
-	The PBC Go Wrapper is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	The PBC Go Wrapper is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-	GNU Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with The PBC Go Wrapper. If not, see <http://www.gnu.org/licenses/>.
-
-	The PBC Go Wrapper makes use of The PBC library. The PBC Library and its
-	use are covered under the terms of the GNU Lesser General Public License
-	version 3, or (at your option) any later version.
-*/
+// Copyright © 2015 Nik Unger
+//
+// This file is part of The PBC Go Wrapper.
+//
+// The PBC Go Wrapper is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Lesser General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or (at your
+// option) any later version.
+//
+// The PBC Go Wrapper is distributed in the hope that it will be useful, but
+// WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+// or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
+// License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public License
+// along with The PBC Go Wrapper. If not, see <http://www.gnu.org/licenses/>.
+//
+// The PBC Go Wrapper makes use of The PBC library. The PBC Library and its use
+// are covered under the terms of the GNU Lesser General Public License
+// version 3, or (at your option) any later version.
 
 package pbc
 
diff --git a/pbc_test.go b/pbc_test.go
index 15f06e00451067d86d02ce1cdbd49e0b086fb391..af99836580ee36faaab8c55ecc635a1f6b4477ea 100644
--- a/pbc_test.go
+++ b/pbc_test.go
@@ -1,25 +1,23 @@
-/*
-	Copyright © 2015 Nik Unger
-
-	This file is part of The PBC Go Wrapper.
-
-	The PBC Go Wrapper is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	The PBC Go Wrapper is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-	GNU Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with The PBC Go Wrapper. If not, see <http://www.gnu.org/licenses/>.
-
-	The PBC Go Wrapper makes use of The PBC library. The PBC Library and its
-	use are covered under the terms of the GNU Lesser General Public License
-	version 3, or (at your option) any later version.
-*/
+// Copyright © 2015 Nik Unger
+//
+// This file is part of The PBC Go Wrapper.
+//
+// The PBC Go Wrapper is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Lesser General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or (at your
+// option) any later version.
+//
+// The PBC Go Wrapper is distributed in the hope that it will be useful, but
+// WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+// or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
+// License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public License
+// along with The PBC Go Wrapper. If not, see <http://www.gnu.org/licenses/>.
+//
+// The PBC Go Wrapper makes use of The PBC library. The PBC Library and its use
+// are covered under the terms of the GNU Lesser General Public License
+// version 3, or (at your option) any later version.
 
 package pbc
 
diff --git a/rand_hook.c b/rand_hook.c
index 93baf1818dd30022cafed1bfce254317b1320f6d..f0d3a42dff112637275a61388073ac369070cc48 100644
--- a/rand_hook.c
+++ b/rand_hook.c
@@ -1,25 +1,23 @@
-/*
-	Copyright © 2015 Nik Unger
-
-	This file is part of The PBC Go Wrapper.
-
-	The PBC Go Wrapper is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-	
-	The PBC Go Wrapper is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-	GNU Lesser General Public License for more details.
-	
-	You should have received a copy of the GNU Lesser General Public License
-	along with The PBC Go Wrapper. If not, see <http://www.gnu.org/licenses/>.
-
-	The PBC Go Wrapper makes use of The PBC library. The PBC Library and its
-	use are covered under the terms of the GNU Lesser General Public License
-	version 3, or (at your option) any later version.
-*/
+// Copyright © 2015 Nik Unger
+//
+// This file is part of The PBC Go Wrapper.
+//
+// The PBC Go Wrapper is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Lesser General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or (at your
+// option) any later version.
+//
+// The PBC Go Wrapper is distributed in the hope that it will be useful, but
+// WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+// or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
+// License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public License
+// along with The PBC Go Wrapper. If not, see <http://www.gnu.org/licenses/>.
+//
+// The PBC Go Wrapper makes use of The PBC library. The PBC Library and its use
+// are covered under the terms of the GNU Lesser General Public License
+// version 3, or (at your option) any later version.
 
 #include "_cgo_export.h"
 #include <pbc/pbc.h>
diff --git a/utils.go b/utils.go
index 555b7d1204014f8928f3d446f962fa8cda1a45db..6c62d0292aa7a365185a49eac78b430cc3b26bbf 100644
--- a/utils.go
+++ b/utils.go
@@ -1,25 +1,23 @@
-/*
-	Copyright © 2015 Nik Unger
-
-	This file is part of The PBC Go Wrapper.
-
-	The PBC Go Wrapper is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	The PBC Go Wrapper is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-	GNU Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with The PBC Go Wrapper. If not, see <http://www.gnu.org/licenses/>.
-
-	The PBC Go Wrapper makes use of The PBC library. The PBC Library and its
-	use are covered under the terms of the GNU Lesser General Public License
-	version 3, or (at your option) any later version.
-*/
+// Copyright © 2015 Nik Unger
+//
+// This file is part of The PBC Go Wrapper.
+//
+// The PBC Go Wrapper is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Lesser General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or (at your
+// option) any later version.
+//
+// The PBC Go Wrapper is distributed in the hope that it will be useful, but
+// WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+// or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
+// License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public License
+// along with The PBC Go Wrapper. If not, see <http://www.gnu.org/licenses/>.
+//
+// The PBC Go Wrapper makes use of The PBC library. The PBC Library and its use
+// are covered under the terms of the GNU Lesser General Public License
+// version 3, or (at your option) any later version.
 
 package pbc